84. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:33 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

84.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/Plugin/Controller/ProductCompareWishlist.php2018-10-10 20:33:20 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/code/Mageplaza/LayeredNavigation/Plugin/Controller/ProductCompareWishlist.php2020-06-26 11:11:14 +0000

84.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged8118
Changed514
Inserted22
Removed00

84.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

84.4 Active regular expressions

No regular expressions were active.

84.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_LayeredNavigation 17  * @package     Mageplaza_LayeredNavigation
18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21  21 
22 namespace Mageplaza\LayeredNavigation\Plugin\Controller\Product; 22 namespace Mageplaza\LayeredNavigation\Plugin\Controller\Product;
23  23 
24 use Magento\Framework\App\RequestInterface; 24 use Magento\Framework\App\RequestInterface;
    25 use Magento\Wishlist\Controller\Index\Add;
25 use Mageplaza\LayeredNavigation\Helper\Data; 26 use Mageplaza\LayeredNavigation\Helper\Data;
26  27 
27 /** 28 /**
28  * Class CompareWishlist 29  * Class CompareWishlist
29  * @package Mageplaza\LayeredNavigation\Plugin\Controller\Product 30  * @package Mageplaza\LayeredNavigation\Plugin\Controller\Product
30  */ 31  */
31 class CompareWishlist 32 class CompareWishlist
32 { 33 {
33     /** @var \Magento\Framework\App\RequestInterface */ 34     /** @var 
RequestInterface */
34     protected $request; 35     protected $request;
35  36 
36     /** @var \Mageplaza\LayeredNavigation\Helper\Data */ 37     /** @var Data */
37     protected $dataHelper; 38     protected $dataHelper;
38  39 
39     /** 40     /**
40      * Add constructor. 41      * Add constructor.
41      * @param \Magento\Framework\App\RequestInterface $request 42      *
42      * @param \Mageplaza\LayeredNavigation\Helper\Data $helperData 43      * @param 
RequestInterface $request
    44      * @param 
Data $helperData
43      */ 45      */
44     public function __construct( 46     public function __construct(
45         RequestInterface $request, 47         RequestInterface $request,
46         Data $helperData 48         Data $helperData
47     )
 49     ) {
48     {    
49         $this->request    = $request; 50         $this->request    = $request;
50         $this->dataHelper = $helperData; 51         $this->dataHelper = $helperData;
51     } 52     }
52  53 
53     /** 54     /**
54      * @param \Magento\Catalog\Controller\Product\Compare\Add|\Magento\Wishlist\Controller\Index\Add $action 55      * @param \Magento\Catalog\Controller\Product\Compare\Add|
Add $action
55      * @param $page 56      * @param $page
    57      *
56      * @return mixed 58      * @return mixed
57      */ 59      */
58     public function afterExecute($action, $page) 60     public function afterExecute($action, $page)
59     { 61     {
60         if ($this->dataHelper->isEnabled() && $this->request->isAjax()) { 62         if ($this->dataHelper->isEnabled() && $this->request->isAjax()) {
61             return ''; 63             return '';
62         } 64         }
63  65 
64         return $page; 66         return $page;
65     } 67     }
66 } 68 }